Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ert rework #132

Merged
merged 6 commits into from
Jul 25, 2024
Merged

ert rework #132

merged 6 commits into from
Jul 25, 2024

Conversation

Ratyyy
Copy link
Collaborator

@Ratyyy Ratyyy commented Jul 20, 2024 •
edited
Loading

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑 Крыска

  • add: НТ начало поставлять новое снаряжение для ОБР.
  • add: После собрания акционеров, было принято решение сформировать отдельные отряды для борьбы с бунтами.
  • add: Величайшие умы НТ пришли к выводу, что в m-90 можно заряжать гранаты в подствольный гранатомёт!

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Changes: Sprites Изменение спрайтов Changes: Map Изменение карт Changes: Localization Изменение локализации and removed Merge Conflict labels Jul 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 20, 2024 •
edited
Loading

RSI Diff Bot; head commit 9387d3b merging into 907b4fa
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Back/Duffels/syndicate.rsi

State Old New Status
ammo-equipped-BACKPACK Modified
equipped-BACKPACK Modified
icon-ammo Modified
icon-med Modified
icon Modified
inhand-left Modified
inhand-right Modified
med-equipped-BACKPACK Modified

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET-vox Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vox Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET-vox Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vox Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET-vox Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vox Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET-vox Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Clothing/Head/Hardsuits/riotert.rsi

State Old New Status
equipped-HELMET-vulp Added
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi

State Old New Status
equipped-FEET Added
icon-on Added
icon Added
inhand-left Added
inhand-right Added
on-equipped-FEET Added
on-inhand-left Added
on-inhand-right Added

Resources/Textures/ADT/Objects/Specific/bobert.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Objects/Specific/tradeunit.rsi

State Old New Status
inhand-left Added
inhand-right Added
tradeunit Added

Resources/Textures/ADT/Objects/Storage/weaponcase.rsi

State Old New Status
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ion_rifle.rsi

State Old New Status
base Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/deser_eagle.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Edit: diff updated after 9387d3b

Darkiich
Darkiich approved these changes Jul 21, 2024
View reviewed changes
Copy link
Contributor

@Darkiich Darkiich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Найс

@github-actions github-actions bot added the Status: Awaiting Changes Ожидание изменений label Jul 21, 2024
@github-actions github-actions bot removed the Status: Awaiting Changes Ожидание изменений label Jul 21, 2024
@Darkiich
Copy link
Contributor

2 апрува, сильно

@Ratyyy Ratyyy added this pull request to the merge queue Jul 25, 2024
Merged via the queue into master with commit 5dd558f Jul 25, 2024
13 checks passed
@Ratyyy Ratyyy deleted the ERT branch July 25, 2024 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1Stepka1 1Stepka1 1Stepka1 left review comments

@Schrodinger71 Schrodinger71 Schrodinger71 approved these changes

@Darkiich Darkiich Darkiich approved these changes

Assignees

@Darkiich Darkiich

@1Stepka1 1Stepka1

@Ratyyy Ratyyy

Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Ratyyy @Darkiich @1Stepka1 @Schrodinger71